/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_xemacs.idb / usr / freeware / lib / xemacs-20.4 / lisp / ediff / ediff-hook.elc.z / ediff-hook.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 54 68 75 20 4a | 61 6e 20 32 32 20 31 34 |on Thu J|an 22 14|
|00000040| 3a 34 34 3a 33 37 20 31 | 39 39 38 0a 3b 3b 3b 20 |:44:37 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 78 65 | 6d 61 63 73 2d 32 30 2e |emacs/xe|macs-20.|
|00000090| 33 2f 6c 69 73 70 2f 65 | 64 69 66 66 2f 65 64 69 |3/lisp/e|diff/edi|
|000000a0| 66 66 2d 68 6f 6f 6b 2e | 65 6c 0a 3b 3b 3b 20 65 |ff-hook.|el.;;; e|
|000000b0| 6d 61 63 73 20 76 65 72 | 73 69 6f 6e 20 32 30 2e |macs ver|sion 20.|
|000000c0| 33 20 22 56 61 74 69 63 | 61 6e 20 43 69 74 79 22 |3 "Vatic|an City"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. |    (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 |    (err|or "`edi|
|000001f0| 66 66 2d 68 6f 6f 6b 2e | 65 6c 27 20 77 61 73 20 |ff-hook.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 09 | 42 11 c2 09 42 11 c3 09 |code "..|B...B...|
|00000270| 42 11 c4 09 42 11 c5 09 | 42 11 c0 87 22 20 5b 65 |B...B...|B..." [e|
|00000280| 64 69 66 66 2d 6d 65 6e | 75 20 63 75 72 72 65 6e |diff-men|u curren|
|00000290| 74 2d 6c 6f 61 64 2d 6c | 69 73 74 20 65 64 69 66 |t-load-l|ist edif|
|000002a0| 66 2d 6d 65 72 67 65 2d | 6d 65 6e 75 20 65 70 61 |f-merge-|menu epa|
|000002b0| 74 63 68 2d 6d 65 6e 75 | 20 65 64 69 66 66 2d 6d |tch-menu| ediff-m|
|000002c0| 69 73 63 2d 6d 65 6e 75 | 20 65 64 69 66 66 2d 77 |isc-menu| ediff-w|
|000002d0| 69 6e 64 6f 77 2d 73 65 | 74 75 70 2d 66 75 6e 63 |indow-se|tup-func|
|000002e0| 74 69 6f 6e 5d 20 32 29 | 0a 28 64 65 66 61 6c 69 |tion] 2)|.(defali|
|000002f0| 61 73 20 27 65 64 69 66 | 66 2d 78 65 6d 61 63 73 |as 'edif|f-xemacs|
|00000300| 2d 69 6e 69 74 2d 6d 65 | 6e 75 73 20 23 5b 6e 69 |-init-me|nus #[ni|
|00000310| 6c 20 22 c0 c1 21 ad a0 | c2 c3 0c c5 23 88 c2 c6 |l "..!..|....#...|
|00000320| 0e 07 c5 23 88 c2 c8 0e | 09 c5 23 88 c2 ca 0e 0b |...#....|..#.....|
|00000330| c5 23 88 cc cd ce c5 23 | 87 22 20 5b 66 65 61 74 |.#.....#|." [feat|
|00000340| 75 72 65 70 20 6d 65 6e | 75 62 61 72 20 61 64 64 |urep men|ubar add|
|00000350| 2d 73 75 62 6d 65 6e 75 | 20 28 22 54 6f 6f 6c 73 |-submenu| ("Tools|
|00000360| 22 29 20 65 64 69 66 66 | 2d 6d 65 6e 75 20 22 4f |") ediff|-menu "O|
|00000370| 4f 2d 42 72 6f 77 73 65 | 72 2e 2e 2e 22 20 28 22 |O-Browse|r..." ("|
|00000380| 54 6f 6f 6c 73 22 29 20 | 65 64 69 66 66 2d 6d 65 |Tools") |ediff-me|
|00000390| 72 67 65 2d 6d 65 6e 75 | 20 28 22 54 6f 6f 6c 73 |rge-menu| ("Tools|
|000003a0| 22 29 20 65 70 61 74 63 | 68 2d 6d 65 6e 75 20 28 |") epatc|h-menu (|
|000003b0| 22 54 6f 6f 6c 73 22 29 | 20 65 64 69 66 66 2d 6d |"Tools")| ediff-m|
|000003c0| 69 73 63 2d 6d 65 6e 75 | 20 61 64 64 2d 6d 65 6e |isc-menu| add-men|
|000003d0| 75 2d 62 75 74 74 6f 6e | 20 28 22 54 6f 6f 6c 73 |u-button| ("Tools|
|000003e0| 22 29 20 5b 22 2d 2d 2d | 2d 2d 2d 2d 22 20 6e 69 |") ["---|----" ni|
|000003f0| 6c 20 6e 69 6c 5d 5d 20 | 34 5d 29 0a 28 62 79 74 |l nil]] |4]).(byt|
|00000400| 65 2d 63 6f 64 65 20 22 | c0 c1 5c 6e 5c 22 ab bd |e-code "|..\n\"..|
|00000410| c3 c4 21 ac 82 c5 14 c4 | 0e 06 42 16 06 c3 c7 21 |..!.....|..B....!|
|00000420| ac 83 c8 16 07 c7 0e 06 | 42 16 06 c3 c9 21 ac 83 |........|B....!..|
|00000430| ca 16 09 c9 0e 06 42 16 | 06 c3 cb 21 ac 83 cc 16 |......B.|...!....|
|00000440| 0b cb 0e 06 42 16 06 cd | 20 88 82 c7 01 ce cf 21 |....B...| ......!|
|00000450| 83 c7 01 c3 d0 21 ac 85 | d1 d2 21 16 10 d0 0e 06 |.....!..|..!.....|
|00000460| 42 16 06 d0 89 4a 4d 88 | c3 d3 21 ac 85 d1 d4 21 |B....JM.|..!....!|
|00000470| 16 13 d3 0e 06 42 16 06 | d3 89 4a 4d 88 c3 d5 21 |.....B..|..JM...!|
|00000480| ac 85 d1 d6 21 16 15 d5 | 0e 06 42 16 06 d5 89 4a |....!...|..B....J|
|00000490| 4d 88 c3 d7 21 ac 85 d1 | d8 21 16 17 d7 0e 06 42 |M...!...|.!.....B|
|000004a0| 16 06 d7 89 4a 4d 88 d9 | 0e 17 da db 23 88 d9 0e |....JM..|....#...|
|000004b0| 17 dc dd 23 88 d9 0e 17 | de df 23 88 d9 0e 17 e0 |...#....|..#.....|
|000004c0| e1 23 88 d9 0e 17 e2 e3 | 23 88 d9 0e 17 e4 e5 23 |.#......|#......#|
|000004d0| 88 d9 0e 17 e6 e7 23 88 | d9 0e 17 e8 e9 23 88 d9 |......#.|.....#..|
|000004e0| 0e 17 ea eb 23 88 d9 0e | 17 ec ed 23 88 d9 0e 17 |....#...|...#....|
|000004f0| ee ef 23 88 d9 0e 17 f0 | f1 23 88 d9 0e 17 f2 f3 |..#.....|.#......|
|00000500| 23 88 d9 0e 17 f4 f5 23 | 88 d9 0e 17 f6 f7 23 88 |#......#|......#.|
|00000510| d9 0e 17 f8 f9 23 88 d9 | 0e 17 fa fb 23 88 d9 0e |.....#..|....#...|
|00000520| 15 fc fd 23 88 d9 0e 15 | fe ff 23 88 d9 0e 15 81 |...#....|..#.....|
|00000530| 40 00 81 41 00 23 88 d9 | 0e 15 81 42 00 81 43 00 |@..A.#..|...B..C.|
|00000540| 23 88 d9 0e 15 81 44 00 | 81 45 00 23 88 d9 0e 15 |#.....D.|.E.#....|
|00000550| 81 46 00 81 47 00 23 88 | d9 0e 15 81 48 00 81 49 |.F..G.#.|....H..I|
|00000560| 00 23 88 d9 0e 15 81 4a | 00 81 4b 00 23 88 d9 0e |.#.....J|..K.#...|
|00000570| 15 81 4c 00 81 4d 00 23 | 88 d9 0e 15 81 4e 00 81 |..L..M.#|.....N..|
|00000580| 4f 00 23 88 d9 0e 15 81 | 50 00 81 51 00 23 88 d9 |O.#.....|P..Q.#..|
|00000590| 0e 15 81 52 00 81 53 00 | 23 88 d9 0e 13 81 54 00 |...R..S.|#.....T.|
|000005a0| 81 55 00 23 88 d9 0e 13 | 81 56 00 81 57 00 23 88 |.U.#....|.V..W.#.|
|000005b0| d9 0e 10 81 58 00 81 59 | 00 23 88 d9 0e 10 81 5a |....X..Y|.#.....Z|
|000005c0| 00 81 5b 00 23 88 d9 0e | 10 81 5c 5c 00 81 5d 00 |..[.#...|..\\..].|
|000005d0| 23 88 0e 5e 84 c6 04 81 | 5f 00 81 60 00 81 61 00 |#..^....|_..`..a.|
|000005e0| 81 62 00 81 63 00 24 88 | 81 5f 00 81 64 00 81 61 |.b..c.$.|._..d..a|
|000005f0| 00 81 62 00 81 63 00 24 | 88 81 5f 00 81 65 00 81 |..b..c.$|.._..e..|
|00000600| 61 00 81 66 00 81 63 00 | 24 88 81 5f 00 81 67 00 |a..f..c.|$.._..g.|
|00000610| 81 61 00 81 66 00 81 63 | 00 24 88 81 5f 00 81 68 |.a..f..c|.$.._..h|
|00000620| 00 81 61 00 81 69 00 81 | 63 00 24 88 81 5f 00 81 |..a..i..|c.$.._..|
|00000630| 6a 00 81 61 00 81 69 00 | 81 63 00 24 88 81 5f 00 |j..a..i.|.c.$.._.|
|00000640| 81 6b 00 81 61 00 81 6c | 00 81 63 00 24 88 81 5f |.k..a..l|..c.$.._|
|00000650| 00 81 6d 00 81 61 00 81 | 6c 00 81 63 00 24 88 81 |..m..a..|l..c.$..|
|00000660| 5f 00 81 6e 00 81 61 00 | 81 6f 00 81 63 00 24 88 |_..n..a.|.o..c.$.|
|00000670| 81 5f 00 81 70 00 81 61 | 00 81 6f 00 81 63 00 24 |._..p..a|..o..c.$|
|00000680| 88 81 5f 00 81 71 00 81 | 61 00 81 72 00 81 63 00 |.._..q..|a..r..c.|
|00000690| 24 88 81 5f 00 81 73 00 | 81 61 00 81 74 00 81 63 |$.._..s.|.a..t..c|
|000006a0| 00 24 88 81 5f 00 81 75 | 00 81 61 00 81 76 00 81 |.$.._..u|..a..v..|
|000006b0| 63 00 24 88 81 5f 00 81 | 77 00 81 61 00 81 78 00 |c.$.._..|w..a..x.|
|000006c0| 81 63 00 24 88 81 5f 00 | 81 79 00 81 61 00 81 7a |.c.$.._.|.y..a..z|
|000006d0| 00 81 63 00 24 88 81 5f | 00 81 7b 00 81 61 00 81 |..c.$.._|..{..a..|
|000006e0| 7a 00 81 63 00 24 88 81 | 5f 00 81 7c 00 81 61 00 |z..c.$..|_..|..a.|
|000006f0| 81 7d 00 23 88 81 5f 00 | 81 7e 00 81 61 00 81 7d |.}.#.._.|.~..a..}|
|00000700| 00 81 63 00 24 88 81 5f | 00 81 7f 00 81 61 00 81 |..c.$.._|.....a..|
|00000710| 80 00 81 63 00 24 88 81 | 5f 00 81 81 00 81 61 00 |...c.$..|_.....a.|
|00000720| 81 80 00 81 63 00 24 88 | 81 5f 00 81 82 00 81 61 |....c.$.|._.....a|
|00000730| 00 81 83 00 81 63 00 24 | 88 81 5f 00 81 84 00 81 |.....c.$|.._.....|
|00000740| 61 00 81 85 00 81 63 00 | 24 88 81 5f 00 81 86 00 |a.....c.|$.._....|
|00000750| 81 61 00 81 87 00 81 63 | 00 24 88 81 5f 00 81 88 |.a.....c|.$.._...|
|00000760| 00 81 61 00 81 89 00 81 | 63 00 24 88 81 5f 00 81 |..a.....|c.$.._..|
|00000770| 8a 00 81 61 00 81 89 00 | 81 63 00 24 88 81 5f 00 |...a....|.c.$.._.|
|00000780| 81 8b 00 81 61 00 81 8c | 00 81 63 00 24 88 81 5f |....a...|..c.$.._|
|00000790| 00 81 8d 00 81 61 00 81 | 8c 00 81 63 00 24 88 81 |.....a..|...c.$..|
|000007a0| 5f 00 81 8e 00 81 61 00 | 81 8f 00 81 63 00 24 88 |_.....a.|....c.$.|
|000007b0| 81 5f 00 81 90 00 81 61 | 00 81 8f 00 81 63 00 24 |._.....a|.....c.$|
|000007c0| 88 81 5f 00 81 91 00 81 | 61 00 81 92 00 81 63 00 |.._.....|a.....c.|
|000007d0| 24 88 81 5f 00 81 93 00 | 81 61 00 81 92 00 81 63 |$.._....|.a.....c|
|000007e0| 00 24 88 81 5f 00 81 94 | 00 81 61 00 81 95 00 81 |.$.._...|..a.....|
|000007f0| 63 00 24 88 81 5f 00 81 | 96 00 81 61 00 81 95 00 |c.$.._..|...a....|
|00000800| 81 63 00 24 88 81 5f 00 | 81 97 00 81 61 00 81 98 |.c.$.._.|....a...|
|00000810| 00 81 63 00 24 88 81 5f | 00 81 99 00 81 61 00 81 |..c.$.._|.....a..|
|00000820| 98 00 81 63 00 24 88 81 | 5f 00 81 9a 00 81 61 00 |...c.$..|_.....a.|
|00000830| 81 9b 00 81 63 00 24 88 | 81 5f 00 81 9c 00 81 61 |....c.$.|._.....a|
|00000840| 00 81 9b 00 81 63 00 24 | 88 81 5f 00 81 9d 00 81 |.....c.$|.._.....|
|00000850| 61 00 81 9e 00 81 63 00 | 24 88 81 5f 00 81 9f 00 |a.....c.|$.._....|
|00000860| 81 61 00 81 9e 00 81 63 | 00 24 88 81 5f 00 81 a0 |.a.....c|.$.._...|
|00000870| 00 81 a1 00 81 a2 00 81 | 63 00 24 88 81 5f 00 81 |........|c.$.._..|
|00000880| a3 00 81 a1 00 81 a2 00 | 81 63 00 24 88 81 5f 00 |........|.c.$.._.|
|00000890| 81 a4 00 81 61 00 81 a5 | 00 81 63 00 24 88 81 5f |....a...|..c.$.._|
|000008a0| 00 81 a6 00 81 61 00 81 | a7 00 81 63 00 24 88 81 |.....a..|...c.$..|
|000008b0| 5f 00 81 a8 00 81 a9 00 | 81 aa 00 81 63 00 24 88 |_.......|....c.$.|
|000008c0| 81 5f 00 81 ab 00 81 a9 | 00 81 ac 00 81 63 00 24 |._......|.....c.$|
|000008d0| 88 81 ad 00 81 ae 00 21 | 87 22 20 5b 73 74 72 69 |.......!|." [stri|
|000008e0| 6e 67 2d 6d 61 74 63 68 | 20 22 58 45 6d 61 63 73 |ng-match| "XEmacs|
|000008f0| 22 20 65 6d 61 63 73 2d | 76 65 72 73 69 6f 6e 20 |" emacs-|version |
|00000900| 62 6f 75 6e 64 70 20 65 | 64 69 66 66 2d 6d 65 6e |boundp e|diff-men|
|00000910| 75 20 28 22 43 6f 6d 70 | 61 72 65 22 20 5b 22 54 |u ("Comp|are" ["T|
|00000920| 77 6f 20 46 69 6c 65 73 | 2e 2e 2e 22 20 65 64 69 |wo Files|..." edi|
|00000930| 66 66 2d 66 69 6c 65 73 | 20 74 5d 20 5b 22 54 77 |ff-files| t] ["Tw|
|00000940| 6f 20 42 75 66 66 65 72 | 73 2e 2e 2e 22 20 65 64 |o Buffer|s..." ed|
|00000950| 69 66 66 2d 62 75 66 66 | 65 72 73 20 74 5d 20 5b |iff-buff|ers t] [|
|00000960| 22 54 68 72 65 65 20 46 | 69 6c 65 73 2e 2e 2e 22 |"Three F|iles..."|
|00000970| 20 65 64 69 66 66 2d 66 | 69 6c 65 73 33 20 74 5d | ediff-f|iles3 t]|
|00000980| 20 5b 22 54 68 72 65 65 | 20 42 75 66 66 65 72 73 | ["Three| Buffers|
|00000990| 2e 2e 2e 22 20 65 64 69 | 66 66 2d 62 75 66 66 65 |..." edi|ff-buffe|
|000009a0| 72 73 33 20 74 5d 20 22 | 2d 2d 2d 22 20 5b 22 54 |rs3 t] "|---" ["T|
|000009b0| 77 6f 20 44 69 72 65 63 | 74 6f 72 69 65 73 2e 2e |wo Direc|tories..|
|000009c0| 2e 22 20 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |." ediff|-directo|
|000009d0| 72 69 65 73 20 74 5d 20 | 5b 22 54 68 72 65 65 20 |ries t] |["Three |
|000009e0| 44 69 72 65 63 74 6f 72 | 69 65 73 2e 2e 2e 22 20 |Director|ies..." |
|000009f0| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 69 65 |ediff-di|rectorie|
|00000a00| 73 33 20 74 5d 20 22 2d | 2d 2d 22 20 5b 22 46 69 |s3 t] "-|--" ["Fi|
|00000a10| 6c 65 20 77 69 74 68 20 | 52 65 76 69 73 69 6f 6e |le with |Revision|
|00000a20| 2e 2e 2e 22 20 65 64 69 | 66 66 2d 72 65 76 69 73 |..." edi|ff-revis|
|00000a30| 69 6f 6e 20 74 5d 20 5b | 22 44 69 72 65 63 74 6f |ion t] [|"Directo|
|00000a40| 72 79 20 52 65 76 69 73 | 69 6f 6e 73 2e 2e 2e 22 |ry Revis|ions..."|
|00000a50| 20 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 79 | ediff-d|irectory|
|00000a60| 2d 72 65 76 69 73 69 6f | 6e 73 20 74 5d 20 22 2d |-revisio|ns t] "-|
|00000a70| 2d 2d 22 20 5b 22 57 69 | 6e 64 6f 77 73 20 57 6f |--" ["Wi|ndows Wo|
|00000a80| 72 64 2d 62 79 2d 77 6f | 72 64 2e 2e 2e 22 20 65 |rd-by-wo|rd..." e|
|00000a90| 64 69 66 66 2d 77 69 6e | 64 6f 77 73 2d 77 6f 72 |diff-win|dows-wor|
|00000aa0| 64 77 69 73 65 20 74 5d | 20 5b 22 57 69 6e 64 6f |dwise t]| ["Windo|
|00000ab0| 77 73 20 4c 69 6e 65 2d | 62 79 2d 6c 69 6e 65 2e |ws Line-|by-line.|
|00000ac0| 2e 2e 22 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |.." edif|f-window|
|00000ad0| 73 2d 6c 69 6e 65 77 69 | 73 65 20 74 5d 20 22 2d |s-linewi|se t] "-|
|00000ae0| 2d 2d 22 20 5b 22 52 65 | 67 69 6f 6e 73 20 57 6f |--" ["Re|gions Wo|
|00000af0| 72 64 2d 62 79 2d 77 6f | 72 64 2e 2e 2e 22 20 65 |rd-by-wo|rd..." e|
|00000b00| 64 69 66 66 2d 72 65 67 | 69 6f 6e 73 2d 77 6f 72 |diff-reg|ions-wor|
|00000b10| 64 77 69 73 65 20 74 5d | 20 5b 22 52 65 67 69 6f |dwise t]| ["Regio|
|00000b20| 6e 73 20 4c 69 6e 65 2d | 62 79 2d 6c 69 6e 65 2e |ns Line-|by-line.|
|00000b30| 2e 2e 22 20 65 64 69 66 | 66 2d 72 65 67 69 6f 6e |.." edif|f-region|
|00000b40| 73 2d 6c 69 6e 65 77 69 | 73 65 20 74 5d 29 20 63 |s-linewi|se t]) c|
|00000b50| 75 72 72 65 6e 74 2d 6c | 6f 61 64 2d 6c 69 73 74 |urrent-l|oad-list|
|00000b60| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 6d 65 6e | ediff-m|erge-men|
|00000b70| 75 20 28 22 4d 65 72 67 | 65 22 20 5b 22 46 69 6c |u ("Merg|e" ["Fil|
|00000b80| 65 73 2e 2e 2e 22 20 65 | 64 69 66 66 2d 6d 65 72 |es..." e|diff-mer|
|00000b90| 67 65 2d 66 69 6c 65 73 | 20 74 5d 20 5b 22 46 69 |ge-files| t] ["Fi|
|00000ba0| 6c 65 73 20 77 69 74 68 | 20 41 6e 63 65 73 74 6f |les with| Ancesto|
|00000bb0| 72 2e 2e 2e 22 20 65 64 | 69 66 66 2d 6d 65 72 67 |r..." ed|iff-merg|
|00000bc0| 65 2d 66 69 6c 65 73 2d | 77 69 74 68 2d 61 6e 63 |e-files-|with-anc|
|00000bd0| 65 73 74 6f 72 20 74 5d | 20 5b 22 42 75 66 66 65 |estor t]| ["Buffe|
|00000be0| 72 73 2e 2e 2e 22 20 65 | 64 69 66 66 2d 6d 65 72 |rs..." e|diff-mer|
|00000bf0| 67 65 2d 62 75 66 66 65 | 72 73 20 74 5d 20 5b 22 |ge-buffe|rs t] ["|
|00000c00| 42 75 66 66 65 72 73 20 | 77 69 74 68 20 41 6e 63 |Buffers |with Anc|
|00000c10| 65 73 74 6f 72 2e 2e 2e | 22 20 65 64 69 66 66 2d |estor...|" ediff-|
|00000c20| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 2d 77 69 |merge-bu|ffers-wi|
|00000c30| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 74 5d 20 22 |th-ances|tor t] "|
|00000c40| 2d 2d 2d 22 20 5b 22 44 | 69 72 65 63 74 6f 72 69 |---" ["D|irectori|
|00000c50| 65 73 2e 2e 2e 22 20 65 | 64 69 66 66 2d 6d 65 72 |es..." e|diff-mer|
|00000c60| 67 65 2d 64 69 72 65 63 | 74 6f 72 69 65 73 20 74 |ge-direc|tories t|
|00000c70| 5d 20 5b 22 44 69 72 65 | 63 74 6f 72 69 65 73 20 |] ["Dire|ctories |
|00000c80| 77 69 74 68 20 41 6e 63 | 65 73 74 6f 72 2e 2e 2e |with Anc|estor...|
|00000c90| 22 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |" ediff-|merge-di|
|00000ca0| 72 65 63 74 6f 72 69 65 | 73 2d 77 69 74 68 2d 61 |rectorie|s-with-a|
|00000cb0| 6e 63 65 73 74 6f 72 20 | 74 5d 20 22 2d 2d 2d 22 |ncestor |t] "---"|
|00000cc0| 20 5b 22 52 65 76 69 73 | 69 6f 6e 73 2e 2e 2e 22 | ["Revis|ions..."|
|00000cd0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 72 65 76 | ediff-m|erge-rev|
|00000ce0| 69 73 69 6f 6e 73 20 74 | 5d 20 5b 22 52 65 76 69 |isions t|] ["Revi|
|00000cf0| 73 69 6f 6e 73 20 77 69 | 74 68 20 41 6e 63 65 73 |sions wi|th Ances|
|00000d00| 74 6f 72 2e 2e 2e 22 20 | 65 64 69 66 66 2d 6d 65 |tor..." |ediff-me|
|00000d10| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 2d 77 69 |rge-revi|sions-wi|
|00000d20| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 74 5d 20 5b |th-ances|tor t] [|
|00000d30| 22 44 69 72 65 63 74 6f | 72 79 20 52 65 76 69 73 |"Directo|ry Revis|
|00000d40| 69 6f 6e 73 2e 2e 2e 22 | 20 65 64 69 66 66 2d 6d |ions..."| ediff-m|
|00000d50| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 79 2d 72 |erge-dir|ectory-r|
|00000d60| 65 76 69 73 69 6f 6e 73 | 20 74 5d 20 5b 22 44 69 |evisions| t] ["Di|
|00000d70| 72 65 63 74 6f 72 79 20 | 52 65 76 69 73 69 6f 6e |rectory |Revision|
|00000d80| 73 20 77 69 74 68 20 41 | 6e 63 65 73 74 6f 72 2e |s with A|ncestor.|
|00000d90| 2e 2e 22 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |.." edif|f-merge-|
|00000da0| 64 69 72 65 63 74 6f 72 | 79 2d 72 65 76 69 73 69 |director|y-revisi|
|00000db0| 6f 6e 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ons-with|-ancesto|
|00000dc0| 72 20 74 5d 29 20 65 70 | 61 74 63 68 2d 6d 65 6e |r t]) ep|atch-men|
|00000dd0| 75 20 28 22 41 70 70 6c | 79 20 50 61 74 63 68 22 |u ("Appl|y Patch"|
|00000de0| 20 5b 22 54 6f 20 61 20 | 66 69 6c 65 2e 2e 2e 22 | ["To a |file..."|
|00000df0| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 66 69 6c | ediff-p|atch-fil|
|00000e00| 65 20 74 5d 20 5b 22 54 | 6f 20 61 20 62 75 66 66 |e t] ["T|o a buff|
|00000e10| 65 72 2e 2e 2e 22 20 65 | 64 69 66 66 2d 70 61 74 |er..." e|diff-pat|
|00000e20| 63 68 2d 62 75 66 66 65 | 72 20 74 5d 29 20 65 64 |ch-buffe|r t]) ed|
|00000e30| 69 66 66 2d 6d 69 73 63 | 2d 6d 65 6e 75 20 28 22 |iff-misc|-menu ("|
|00000e40| 45 64 69 66 66 20 4d 69 | 73 63 65 6c 6c 61 6e 65 |Ediff Mi|scellane|
|00000e50| 61 22 20 5b 22 45 64 69 | 66 66 20 4d 61 6e 75 61 |a" ["Edi|ff Manua|
|00000e60| 6c 2e 2e 2e 22 20 65 64 | 69 66 66 2d 64 6f 63 75 |l..." ed|iff-docu|
|00000e70| 6d 65 6e 74 61 74 69 6f | 6e 20 74 5d 20 5b 22 4c |mentatio|n t] ["L|
|00000e80| 69 73 74 20 45 64 69 66 | 66 20 53 65 73 73 69 6f |ist Edif|f Sessio|
|00000e90| 6e 73 2e 2e 2e 22 20 65 | 64 69 66 66 2d 73 68 6f |ns..." e|diff-sho|
|00000ea0| 77 2d 72 65 67 69 73 74 | 72 79 20 74 5d 20 5b 22 |w-regist|ry t] ["|
|00000eb0| 55 73 65 20 73 65 70 61 | 72 61 74 65 20 66 72 61 |Use sepa|rate fra|
|00000ec0| 6d 65 20 66 6f 72 20 45 | 64 69 66 66 20 63 6f 6e |me for E|diff con|
|00000ed0| 74 72 6f 6c 20 62 75 66 | 66 65 72 2e 2e 2e 22 20 |trol buf|fer..." |
|00000ee0| 65 64 69 66 66 2d 74 6f | 67 67 6c 65 2d 6d 75 6c |ediff-to|ggle-mul|
|00000ef0| 74 69 66 72 61 6d 65 20 | 3a 73 74 79 6c 65 20 74 |tiframe |:style t|
|00000f00| 6f 67 67 6c 65 20 3a 73 | 65 6c 65 63 74 65 64 20 |oggle :s|elected |
|00000f10| 28 69 66 20 28 61 6e 64 | 20 28 66 65 61 74 75 72 |(if (and| (featur|
|00000f20| 65 70 20 27 65 64 69 66 | 66 2d 75 74 69 6c 29 20 |ep 'edif|f-util) |
|00000f30| 28 62 6f 75 6e 64 70 20 | 27 65 64 69 66 66 2d 77 |(boundp |'ediff-w|
|00000f40| 69 6e 64 6f 77 2d 73 65 | 74 75 70 2d 66 75 6e 63 |indow-se|tup-func|
|00000f50| 74 69 6f 6e 29 29 20 28 | 65 71 20 65 64 69 66 66 |tion)) (|eq ediff|
|00000f60| 2d 77 69 6e 64 6f 77 2d | 73 65 74 75 70 2d 66 75 |-window-|setup-fu|
|00000f70| 6e 63 74 69 6f 6e 20 27 | 65 64 69 66 66 2d 73 65 |nction '|ediff-se|
|00000f80| 74 75 70 2d 77 69 6e 64 | 6f 77 73 2d 6d 75 6c 74 |tup-wind|ows-mult|
|00000f90| 69 66 72 61 6d 65 29 29 | 5d 20 5b 22 55 73 65 20 |iframe))|] ["Use |
|00000fa0| 61 20 74 6f 6f 6c 62 61 | 72 20 77 69 74 68 20 45 |a toolba|r with E|
|00000fb0| 64 69 66 66 20 63 6f 6e | 74 72 6f 6c 20 62 75 66 |diff con|trol buf|
|00000fc0| 66 65 72 22 20 65 64 69 | 66 66 2d 74 6f 67 67 6c |fer" edi|ff-toggl|
|00000fd0| 65 2d 75 73 65 2d 74 6f | 6f 6c 62 61 72 20 3a 73 |e-use-to|olbar :s|
|00000fe0| 74 79 6c 65 20 74 6f 67 | 67 6c 65 20 3a 73 65 6c |tyle tog|gle :sel|
|00000ff0| 65 63 74 65 64 20 28 69 | 66 20 28 66 65 61 74 75 |ected (i|f (featu|
|00001000| 72 65 70 20 27 65 64 69 | 66 66 2d 74 62 61 72 29 |rep 'edi|ff-tbar)|
|00001010| 20 28 65 64 69 66 66 2d | 75 73 65 2d 74 6f 6f 6c | (ediff-|use-tool|
|00001020| 62 61 72 2d 70 29 29 5d | 29 20 65 64 69 66 66 2d |bar-p))]|) ediff-|
|00001030| 78 65 6d 61 63 73 2d 69 | 6e 69 74 2d 6d 65 6e 75 |xemacs-i|nit-menu|
|00001040| 73 20 66 65 61 74 75 72 | 65 70 20 6d 65 6e 75 2d |s featur|ep menu-|
|00001050| 62 61 72 20 6d 65 6e 75 | 2d 62 61 72 2d 65 64 69 |bar menu|-bar-edi|
|00001060| 66 66 2d 6d 69 73 63 2d | 6d 65 6e 75 20 6d 61 6b |ff-misc-|menu mak|
|00001070| 65 2d 73 70 61 72 73 65 | 2d 6b 65 79 6d 61 70 20 |e-sparse|-keymap |
|00001080| 22 45 64 69 66 66 20 4d | 69 73 63 65 6c 6c 61 6e |"Ediff M|iscellan|
|00001090| 65 61 22 20 6d 65 6e 75 | 2d 62 61 72 2d 65 70 61 |ea" menu|-bar-epa|
|000010a0| 74 63 68 2d 6d 65 6e 75 | 20 22 41 70 70 6c 79 20 |tch-menu| "Apply |
|000010b0| 50 61 74 63 68 22 20 6d | 65 6e 75 2d 62 61 72 2d |Patch" m|enu-bar-|
|000010c0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 6d 65 6e 75 |ediff-me|rge-menu|
|000010d0| 20 22 4d 65 72 67 65 22 | 20 6d 65 6e 75 2d 62 61 | "Merge"| menu-ba|
|000010e0| 72 2d 65 64 69 66 66 2d | 6d 65 6e 75 20 22 43 6f |r-ediff-|menu "Co|
|000010f0| 6d 70 61 72 65 22 20 64 | 65 66 69 6e 65 2d 6b 65 |mpare" d|efine-ke|
|00001100| 79 20 5b 77 69 6e 64 6f | 77 5d 20 28 22 54 68 69 |y [windo|w] ("Thi|
|00001110| 73 20 57 69 6e 64 6f 77 | 20 61 6e 64 20 4e 65 78 |s Window| and Nex|
|00001120| 74 20 57 69 6e 64 6f 77 | 22 20 2e 20 63 6f 6d 70 |t Window|" . comp|
|00001130| 61 72 65 2d 77 69 6e 64 | 6f 77 73 29 20 5b 65 64 |are-wind|ows) [ed|
|00001140| 69 66 66 2d 77 69 6e 64 | 6f 77 73 2d 6c 69 6e 65 |iff-wind|ows-line|
|00001150| 77 69 73 65 5d 20 28 22 | 57 69 6e 64 6f 77 73 20 |wise] ("|Windows |
|00001160| 4c 69 6e 65 2d 62 79 2d | 6c 69 6e 65 2e 2e 2e 22 |Line-by-|line..."|
|00001170| 20 2e 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 73 | . ediff|-windows|
|00001180| 2d 6c 69 6e 65 77 69 73 | 65 29 20 5b 65 64 69 66 |-linewis|e) [edif|
|00001190| 66 2d 77 69 6e 64 6f 77 | 73 2d 77 6f 72 64 77 69 |f-window|s-wordwi|
|000011a0| 73 65 5d 20 28 22 57 69 | 6e 64 6f 77 73 20 57 6f |se] ("Wi|ndows Wo|
|000011b0| 72 64 2d 62 79 2d 77 6f | 72 64 2e 2e 2e 22 20 2e |rd-by-wo|rd..." .|
|000011c0| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 73 2d 77 | ediff-w|indows-w|
|000011d0| 6f 72 64 77 69 73 65 29 | 20 5b 73 65 70 61 72 61 |ordwise)| [separa|
|000011e0| 74 6f 72 2d 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |tor-edif|f-window|
|000011f0| 73 5d 20 28 22 2d 2d 22 | 29 20 5b 65 64 69 66 66 |s] ("--"|) [ediff|
|00001200| 2d 72 65 67 69 6f 6e 73 | 2d 6c 69 6e 65 77 69 73 |-regions|-linewis|
|00001210| 65 5d 20 28 22 52 65 67 | 69 6f 6e 73 20 4c 69 6e |e] ("Reg|ions Lin|
|00001220| 65 2d 62 79 2d 6c 69 6e | 65 2e 2e 2e 22 20 2e 20 |e-by-lin|e..." . |
|00001230| 65 64 69 66 66 2d 72 65 | 67 69 6f 6e 73 2d 6c 69 |ediff-re|gions-li|
|00001240| 6e 65 77 69 73 65 29 20 | 5b 65 64 69 66 66 2d 72 |newise) |[ediff-r|
|00001250| 65 67 69 6f 6e 73 2d 77 | 6f 72 64 77 69 73 65 5d |egions-w|ordwise]|
|00001260| 20 28 22 52 65 67 69 6f | 6e 73 20 57 6f 72 64 2d | ("Regio|ns Word-|
|00001270| 62 79 2d 77 6f 72 64 2e | 2e 2e 22 20 2e 20 65 64 |by-word.|.." . ed|
|00001280| 69 66 66 2d 72 65 67 69 | 6f 6e 73 2d 77 6f 72 64 |iff-regi|ons-word|
|00001290| 77 69 73 65 29 20 5b 73 | 65 70 61 72 61 74 6f 72 |wise) [s|eparator|
|000012a0| 2d 65 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 5d 20 |-ediff-r|egions] |
|000012b0| 28 22 2d 2d 22 29 20 5b | 65 64 69 66 66 2d 64 69 |("--") [|ediff-di|
|000012c0| 72 2d 72 65 76 69 73 69 | 6f 6e 5d 20 28 22 44 69 |r-revisi|on] ("Di|
|000012d0| 72 65 63 74 6f 72 79 20 | 52 65 76 69 73 69 6f 6e |rectory |Revision|
|000012e0| 73 2e 2e 2e 22 20 2e 20 | 65 64 69 66 66 2d 64 69 |s..." . |ediff-di|
|000012f0| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00001300| 73 29 20 5b 65 64 69 66 | 66 2d 72 65 76 69 73 69 |s) [edif|f-revisi|
|00001310| 6f 6e 5d 20 28 22 46 69 | 6c 65 20 77 69 74 68 20 |on] ("Fi|le with |
|00001320| 52 65 76 69 73 69 6f 6e | 2e 2e 2e 22 20 2e 20 65 |Revision|..." . e|
|00001330| 64 69 66 66 2d 72 65 76 | 69 73 69 6f 6e 29 20 5b |diff-rev|ision) [|
|00001340| 73 65 70 61 72 61 74 6f | 72 2d 65 64 69 66 66 2d |separato|r-ediff-|
|00001350| 64 69 72 65 63 74 6f 72 | 69 65 73 5d 20 28 22 2d |director|ies] ("-|
|00001360| 2d 22 29 20 5b 65 64 69 | 66 66 2d 64 69 72 65 63 |-") [edi|ff-direc|
|00001370| 74 6f 72 69 65 73 33 5d | 20 28 22 54 68 72 65 65 |tories3]| ("Three|
|00001380| 20 44 69 72 65 63 74 6f | 72 69 65 73 2e 2e 2e 22 | Directo|ries..."|
|00001390| 20 2e 20 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f | . ediff|-directo|
|000013a0| 72 69 65 73 33 29 20 5b | 65 64 69 66 66 2d 64 69 |ries3) [|ediff-di|
|000013b0| 72 65 63 74 6f 72 69 65 | 73 5d 20 28 22 54 77 6f |rectorie|s] ("Two|
|000013c0| 20 44 69 72 65 63 74 6f | 72 69 65 73 2e 2e 2e 22 | Directo|ries..."|
|000013d0| 20 2e 20 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f | . ediff|-directo|
|000013e0| 72 69 65 73 29 20 5b 73 | 65 70 61 72 61 74 6f 72 |ries) [s|eparator|
|000013f0| 2d 65 64 69 66 66 2d 66 | 69 6c 65 73 5d 20 28 22 |-ediff-f|iles] ("|
|00001400| 2d 2d 22 29 20 5b 65 64 | 69 66 66 2d 62 75 66 66 |--") [ed|iff-buff|
|00001410| 65 72 73 33 5d 20 28 22 | 54 68 72 65 65 20 42 75 |ers3] ("|Three Bu|
|00001420| 66 66 65 72 73 2e 2e 2e | 22 20 2e 20 65 64 69 66 |ffers...|" . edif|
|00001430| 66 2d 62 75 66 66 65 72 | 73 33 29 20 5b 65 64 69 |f-buffer|s3) [edi|
|00001440| 66 66 2d 66 69 6c 65 73 | 33 5d 20 28 22 54 68 72 |ff-files|3] ("Thr|
|00001450| 65 65 20 46 69 6c 65 73 | 2e 2e 2e 22 20 2e 20 65 |ee Files|..." . e|
|00001460| 64 69 66 66 2d 66 69 6c | 65 73 33 29 20 5b 65 64 |diff-fil|es3) [ed|
|00001470| 69 66 66 2d 62 75 66 66 | 65 72 73 5d 20 28 22 54 |iff-buff|ers] ("T|
|00001480| 77 6f 20 42 75 66 66 65 | 72 73 2e 2e 2e 22 20 2e |wo Buffe|rs..." .|
|00001490| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 73 29 20 | ediff-b|uffers) |
|000014a0| 5b 65 64 69 66 66 2d 66 | 69 6c 65 73 5d 20 28 22 |[ediff-f|iles] ("|
|000014b0| 54 77 6f 20 46 69 6c 65 | 73 2e 2e 2e 22 20 2e 20 |Two File|s..." . |
|000014c0| 65 64 69 66 66 2d 66 69 | 6c 65 73 29 20 5b 65 64 |ediff-fi|les) [ed|
|000014d0| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 2d 72 65 |iff-merg|e-dir-re|
|000014e0| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|000014f0| 65 73 74 6f 72 5d 20 28 | 22 44 69 72 65 63 74 6f |estor] (|"Directo|
|00001500| 72 79 20 52 65 76 69 73 | 69 6f 6e 73 20 77 69 74 |ry Revis|ions wit|
|00001510| 68 20 41 6e 63 65 73 74 | 6f 72 2e 2e 2e 22 20 2e |h Ancest|or..." .|
|00001520| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 | ediff-m|erge-dir|
|00001530| 65 63 74 6f 72 79 2d 72 | 65 76 69 73 69 6f 6e 73 |ectory-r|evisions|
|00001540| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 29 20 |-with-an|cestor) |
|00001550| 5b 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 |[ediff-m|erge-dir|
|00001560| 2d 72 65 76 69 73 69 6f | 6e 73 5d 20 28 22 44 69 |-revisio|ns] ("Di|
|00001570| 72 65 63 74 6f 72 79 20 | 52 65 76 69 73 69 6f 6e |rectory |Revision|
|00001580| 73 2e 2e 2e 22 20 2e 20 | 65 64 69 66 66 2d 6d 65 |s..." . |ediff-me|
|00001590| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |rge-dire|ctory-re|
|000015a0| 76 69 73 69 6f 6e 73 29 | 20 5b 65 64 69 66 66 2d |visions)| [ediff-|
|000015b0| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2d |merge-re|visions-|
|000015c0| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 5d 20 28 |with-anc|estor] (|
|000015d0| 22 52 65 76 69 73 69 6f | 6e 73 20 77 69 74 68 20 |"Revisio|ns with |
|000015e0| 41 6e 63 65 73 74 6f 72 | 2e 2e 2e 22 20 2e 20 65 |Ancestor|..." . e|
|000015f0| 64 69 66 66 2d 6d 65 72 | 67 65 2d 72 65 76 69 73 |diff-mer|ge-revis|
|00001600| 69 6f 6e 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |ions-wit|h-ancest|
|00001610| 6f 72 29 20 5b 65 64 69 | 66 66 2d 6d 65 72 67 65 |or) [edi|ff-merge|
|00001620| 2d 72 65 76 69 73 69 6f | 6e 73 5d 20 28 22 52 65 |-revisio|ns] ("Re|
|00001630| 76 69 73 69 6f 6e 73 2e | 2e 2e 22 20 2e 20 65 64 |visions.|.." . ed|
|00001640| 69 66 66 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |iff-merg|e-revisi|
|00001650| 6f 6e 73 29 20 5b 73 65 | 70 61 72 61 74 6f 72 2d |ons) [se|parator-|
|00001660| 65 64 69 66 66 2d 6d 65 | 72 67 65 5d 20 28 22 2d |ediff-me|rge] ("-|
|00001670| 2d 22 29 20 5b 65 64 69 | 66 66 2d 6d 65 72 67 65 |-") [edi|ff-merge|
|00001680| 2d 64 69 72 65 63 74 6f | 72 69 65 73 2d 77 69 74 |-directo|ries-wit|
|00001690| 68 2d 61 6e 63 65 73 74 | 6f 72 5d 20 28 22 44 69 |h-ancest|or] ("Di|
|000016a0| 72 65 63 74 6f 72 69 65 | 73 20 77 69 74 68 20 41 |rectorie|s with A|
|000016b0| 6e 63 65 73 74 6f 72 2e | 2e 2e 22 20 2e 20 65 64 |ncestor.|.." . ed|
|000016c0| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |iff-merg|e-direct|
|000016d0| 6f 72 69 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |ories-wi|th-ances|
|000016e0| 74 6f 72 29 20 5b 65 64 | 69 66 66 2d 6d 65 72 67 |tor) [ed|iff-merg|
|000016f0| 65 2d 64 69 72 65 63 74 | 6f 72 69 65 73 5d 20 28 |e-direct|ories] (|
|00001700| 22 44 69 72 65 63 74 6f | 72 69 65 73 2e 2e 2e 22 |"Directo|ries..."|
|00001710| 20 2e 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 64 | . ediff|-merge-d|
|00001720| 69 72 65 63 74 6f 72 69 | 65 73 29 20 5b 73 65 70 |irectori|es) [sep|
|00001730| 61 72 61 74 6f 72 2d 65 | 64 69 66 66 2d 6d 65 72 |arator-e|diff-mer|
|00001740| 67 65 2d 64 69 72 73 5d | 20 28 22 2d 2d 22 29 20 |ge-dirs]| ("--") |
|00001750| 5b 65 64 69 66 66 2d 6d | 65 72 67 65 2d 62 75 66 |[ediff-m|erge-buf|
|00001760| 66 65 72 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |fers-wit|h-ancest|
|00001770| 6f 72 5d 20 28 22 42 75 | 66 66 65 72 73 20 77 69 |or] ("Bu|ffers wi|
|00001780| 74 68 20 41 6e 63 65 73 | 74 6f 72 2e 2e 2e 22 20 |th Ances|tor..." |
|00001790| 2e 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 62 75 |. ediff-|merge-bu|
|000017a0| 66 66 65 72 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |ffers-wi|th-ances|
|000017b0| 74 6f 72 29 20 5b 65 64 | 69 66 66 2d 6d 65 72 67 |tor) [ed|iff-merg|
|000017c0| 65 2d 62 75 66 66 65 72 | 73 5d 20 28 22 42 75 66 |e-buffer|s] ("Buf|
|000017d0| 66 65 72 73 2e 2e 2e 22 | 20 2e 20 65 64 69 66 66 |fers..."| . ediff|
|000017e0| 2d 6d 65 72 67 65 2d 62 | 75 66 66 65 72 73 29 20 |-merge-b|uffers) |
|000017f0| 5b 65 64 69 66 66 2d 6d | 65 72 67 65 2d 66 69 6c |[ediff-m|erge-fil|
|00001800| 65 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |es-with-|ancestor|
|00001810| 5d 20 28 22 46 69 6c 65 | 73 20 77 69 74 68 20 41 |] ("File|s with A|
|00001820| 6e 63 65 73 74 6f 72 2e | 2e 2e 22 20 2e 20 65 64 |ncestor.|.." . ed|
|00001830| 69 66 66 2d 6d 65 72 67 | 65 2d 66 69 6c 65 73 2d |iff-merg|e-files-|
|00001840| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 29 20 5b |with-anc|estor) [|
|00001850| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 66 69 6c 65 |ediff-me|rge-file|
|00001860| 73 5d 20 28 22 46 69 6c | 65 73 2e 2e 2e 22 20 2e |s] ("Fil|es..." .|
|00001870| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 66 69 6c | ediff-m|erge-fil|
|00001880| 65 73 29 20 5b 65 64 69 | 66 66 2d 70 61 74 63 68 |es) [edi|ff-patch|
|00001890| 2d 62 75 66 66 65 72 5d | 20 28 22 54 6f 20 61 20 |-buffer]| ("To a |
|000018a0| 42 75 66 66 65 72 2e 2e | 2e 22 20 2e 20 65 64 69 |Buffer..|." . edi|
|000018b0| 66 66 2d 70 61 74 63 68 | 2d 62 75 66 66 65 72 29 |ff-patch|-buffer)|
|000018c0| 20 5b 65 64 69 66 66 2d | 70 61 74 63 68 2d 66 69 | [ediff-|patch-fi|
|000018d0| 6c 65 5d 20 28 22 54 6f | 20 61 20 46 69 6c 65 2e |le] ("To| a File.|
|000018e0| 2e 2e 22 20 2e 20 65 64 | 69 66 66 2d 70 61 74 63 |.." . ed|iff-patc|
|000018f0| 68 2d 66 69 6c 65 29 20 | 5b 65 6d 75 6c 74 69 66 |h-file) |[emultif|
|00001900| 72 61 6d 65 5d 20 28 22 | 54 6f 67 67 6c 65 20 75 |rame] ("|Toggle u|
|00001910| 73 65 20 6f 66 20 73 65 | 70 61 72 61 74 65 20 63 |se of se|parate c|
|00001920| 6f 6e 74 72 6f 6c 20 62 | 75 66 66 65 72 20 66 72 |ontrol b|uffer fr|
|00001930| 61 6d 65 2e 2e 2e 22 20 | 2e 20 65 64 69 66 66 2d |ame..." |. ediff-|
|00001940| 74 6f 67 67 6c 65 2d 6d | 75 6c 74 69 66 72 61 6d |toggle-m|ultifram|
|00001950| 65 29 20 5b 65 72 65 67 | 69 73 74 72 79 5d 20 28 |e) [ereg|istry] (|
|00001960| 22 4c 69 73 74 20 45 64 | 69 66 66 20 53 65 73 73 |"List Ed|iff Sess|
|00001970| 69 6f 6e 73 2e 2e 2e 22 | 20 2e 20 65 64 69 66 66 |ions..."| . ediff|
|00001980| 2d 73 68 6f 77 2d 72 65 | 67 69 73 74 72 79 29 20 |-show-re|gistry) |
|00001990| 5b 65 64 69 66 66 2d 64 | 6f 63 5d 20 28 22 45 64 |[ediff-d|oc] ("Ed|
|000019a0| 69 66 66 20 4d 61 6e 75 | 61 6c 2e 2e 2e 22 20 2e |iff Manu|al..." .|
|000019b0| 20 65 64 69 66 66 2d 64 | 6f 63 75 6d 65 6e 74 61 | ediff-d|ocumenta|
|000019c0| 74 69 6f 6e 29 20 70 75 | 72 69 66 79 2d 66 6c 61 |tion) pu|rify-fla|
|000019d0| 67 20 61 75 74 6f 6c 6f | 61 64 20 65 64 69 66 66 |g autolo|ad ediff|
|000019e0| 20 22 65 64 69 66 66 22 | 20 22 43 6f 6d 70 61 72 | "ediff"| "Compar|
|000019f0| 65 20 74 77 6f 20 66 69 | 6c 65 73 22 20 74 20 65 |e two fi|les" t e|
|00001a00| 64 69 66 66 2d 66 69 6c | 65 73 20 65 64 69 66 66 |diff-fil|es ediff|
|00001a10| 2d 62 75 66 66 65 72 73 | 20 22 43 6f 6d 70 61 72 |-buffers| "Compar|
|00001a20| 65 20 74 77 6f 20 62 75 | 66 65 72 73 22 20 65 62 |e two bu|fers" eb|
|00001a30| 75 66 66 65 72 73 20 65 | 64 69 66 66 33 20 22 43 |uffers e|diff3 "C|
|00001a40| 6f 6d 70 61 72 65 20 74 | 68 72 65 65 20 66 69 6c |ompare t|hree fil|
|00001a50| 65 73 22 20 65 64 69 66 | 66 2d 66 69 6c 65 73 33 |es" edif|f-files3|
|00001a60| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 73 33 20 | ediff-b|uffers3 |
|00001a70| 22 43 6f 6d 70 61 72 65 | 20 74 68 72 65 65 20 62 |"Compare| three b|
|00001a80| 75 66 65 72 73 22 20 65 | 62 75 66 66 65 72 73 33 |ufers" e|buffers3|
|00001a90| 20 65 72 65 76 69 73 69 | 6f 6e 20 22 43 6f 6d 70 | erevisi|on "Comp|
|00001aa0| 61 72 65 20 76 65 72 73 | 69 6f 6e 73 20 6f 66 20 |are vers|ions of |
|00001ab0| 61 20 66 69 6c 65 22 20 | 65 64 69 66 66 2d 72 65 |a file" |ediff-re|
|00001ac0| 76 69 73 69 6f 6e 20 65 | 64 69 66 66 2d 77 69 6e |vision e|diff-win|
|00001ad0| 64 6f 77 73 2d 77 6f 72 | 64 77 69 73 65 20 22 43 |dows-wor|dwise "C|
|00001ae0| 6f 6d 70 61 72 65 20 74 | 77 6f 20 77 69 6e 64 6f |ompare t|wo windo|
|00001af0| 77 73 20 77 6f 72 64 2d | 62 79 2d 77 6f 72 64 2e |ws word-|by-word.|
|00001b00| 22 20 65 64 69 66 66 2d | 72 65 67 69 6f 6e 73 2d |" ediff-|regions-|
|00001b10| 77 6f 72 64 77 69 73 65 | 20 22 43 6f 6d 70 61 72 |wordwise| "Compar|
|00001b20| 65 20 74 77 6f 20 72 65 | 67 69 6f 6e 73 20 77 6f |e two re|gions wo|
|00001b30| 72 64 2d 62 79 2d 77 6f | 72 64 2e 22 20 65 64 69 |rd-by-wo|rd." edi|
|00001b40| 66 66 2d 77 69 6e 64 6f | 77 73 2d 6c 69 6e 65 77 |ff-windo|ws-linew|
|00001b50| 69 73 65 20 22 43 6f 6d | 70 61 72 65 20 74 77 6f |ise "Com|pare two|
|00001b60| 20 77 69 6e 64 6f 77 73 | 20 6c 69 6e 65 2d 62 79 | windows| line-by|
|00001b70| 2d 6c 69 6e 65 2e 22 20 | 65 64 69 66 66 2d 72 65 |-line." |ediff-re|
|00001b80| 67 69 6f 6e 73 2d 6c 69 | 6e 65 77 69 73 65 20 22 |gions-li|newise "|
|00001b90| 43 6f 6d 70 61 72 65 20 | 74 77 6f 20 72 65 67 69 |Compare |two regi|
|00001ba0| 6f 6e 73 20 6c 69 6e 65 | 2d 62 79 2d 6c 69 6e 65 |ons line|-by-line|
|00001bb0| 2e 22 20 65 64 69 66 66 | 2d 70 61 74 63 68 2d 66 |." ediff|-patch-f|
|00001bc0| 69 6c 65 20 22 50 61 74 | 63 68 20 61 20 66 69 6c |ile "Pat|ch a fil|
|00001bd0| 65 2e 22 20 65 70 61 74 | 63 68 20 65 64 69 66 66 |e." epat|ch ediff|
|00001be0| 2d 70 61 74 63 68 2d 62 | 75 66 66 65 72 20 22 50 |-patch-b|uffer "P|
|00001bf0| 61 74 63 68 20 61 20 62 | 75 66 66 65 72 2e 22 20 |atch a b|uffer." |
|00001c00| 65 70 61 74 63 68 2d 62 | 75 66 66 65 72 20 65 64 |epatch-b|uffer ed|
|00001c10| 69 66 66 2d 6d 65 72 67 | 65 20 22 4d 65 72 67 65 |iff-merg|e "Merge|
|00001c20| 20 74 77 6f 20 66 69 6c | 65 73 2e 22 20 65 64 69 | two fil|es." edi|
|00001c30| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 20 65 |ff-merge|-files e|
|00001c40| 64 69 66 66 2d 6d 65 72 | 67 65 2d 66 69 6c 65 73 |diff-mer|ge-files|
|00001c50| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 22 |-with-an|cestor "|
|00001c60| 4d 65 72 67 65 20 74 77 | 6f 20 66 69 6c 65 73 20 |Merge tw|o files |
|00001c70| 75 73 69 6e 67 20 61 20 | 74 68 69 72 64 20 66 69 |using a |third fi|
|00001c80| 6c 65 20 61 73 20 61 6e | 20 61 6e 63 65 73 74 6f |le as an| ancesto|
|00001c90| 72 2e 22 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |r." edif|f-merge-|
|00001ca0| 62 75 66 66 65 72 73 20 | 22 4d 65 72 67 65 20 74 |buffers |"Merge t|
|00001cb0| 77 6f 20 62 75 66 66 65 | 72 73 2e 22 20 65 64 69 |wo buffe|rs." edi|
|00001cc0| 66 66 2d 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |ff-merge|-buffers|
|00001cd0| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 22 |-with-an|cestor "|
|00001ce0| 4d 65 72 67 65 20 74 77 | 6f 20 62 75 66 66 65 72 |Merge tw|o buffer|
|00001cf0| 73 20 75 73 69 6e 67 20 | 61 20 74 68 69 72 64 20 |s using |a third |
|00001d00| 62 75 66 66 65 72 20 61 | 73 20 61 6e 20 61 6e 63 |buffer a|s an anc|
|00001d10| 65 73 74 6f 72 2e 22 20 | 65 64 69 66 66 2d 6d 65 |estor." |ediff-me|
|00001d20| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 20 22 4d |rge-revi|sions "M|
|00001d30| 65 72 67 65 20 74 77 6f | 20 76 65 72 73 69 6f 6e |erge two| version|
|00001d40| 73 20 6f 66 20 61 20 66 | 69 6c 65 2e 22 20 65 64 |s of a f|ile." ed|
|00001d50| 69 66 66 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |iff-merg|e-revisi|
|00001d60| 6f 6e 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ons-with|-ancesto|
|00001d70| 72 20 65 64 69 72 73 20 | 22 43 6f 6d 70 61 72 65 |r edirs |"Compare|
|00001d80| 20 66 69 6c 65 73 20 69 | 6e 20 74 77 6f 20 64 69 | files i|n two di|
|00001d90| 72 65 63 74 6f 72 69 65 | 73 2e 22 20 65 64 69 66 |rectorie|s." edif|
|00001da0| 66 2d 64 69 72 65 63 74 | 6f 72 69 65 73 20 65 64 |f-direct|ories ed|
|00001db0| 69 72 73 33 20 22 43 6f | 6d 70 61 72 65 20 66 69 |irs3 "Co|mpare fi|
|00001dc0| 6c 65 73 20 69 6e 20 74 | 68 72 65 65 20 64 69 72 |les in t|hree dir|
|00001dd0| 65 63 74 6f 72 69 65 73 | 2e 22 20 65 64 69 66 66 |ectories|." ediff|
|00001de0| 2d 64 69 72 65 63 74 6f | 72 69 65 73 33 20 65 64 |-directo|ries3 ed|
|00001df0| 69 72 2d 72 65 76 69 73 | 69 6f 6e 73 20 22 43 6f |ir-revis|ions "Co|
|00001e00| 6d 70 61 72 65 20 74 77 | 6f 20 76 65 72 73 69 6f |mpare tw|o versio|
|00001e10| 6e 73 20 6f 66 20 61 20 | 66 69 6c 65 2e 22 20 65 |ns of a |file." e|
|00001e20| 64 69 66 66 2d 64 69 72 | 65 63 74 6f 72 79 2d 72 |diff-dir|ectory-r|
|00001e30| 65 76 69 73 69 6f 6e 73 | 20 65 64 69 72 73 2d 6d |evisions| edirs-m|
|00001e40| 65 72 67 65 20 22 4d 65 | 72 67 65 20 66 69 6c 65 |erge "Me|rge file|
|00001e50| 73 20 69 6e 20 74 77 6f | 20 64 69 72 65 63 74 6f |s in two| directo|
|00001e60| 72 69 65 73 2e 22 20 65 | 64 69 66 66 2d 6d 65 72 |ries." e|diff-mer|
|00001e70| 67 65 2d 64 69 72 65 63 | 74 6f 72 69 65 73 20 65 |ge-direc|tories e|
|00001e80| 64 69 72 73 2d 6d 65 72 | 67 65 2d 77 69 74 68 2d |dirs-mer|ge-with-|
|00001e90| 61 6e 63 65 73 74 6f 72 | 20 22 4d 65 72 67 65 20 |ancestor| "Merge |
|00001ea0| 66 69 6c 65 73 20 69 6e | 20 74 77 6f 20 64 69 72 |files in| two dir|
|00001eb0| 65 63 74 6f 72 69 65 73 | 20 75 73 69 6e 67 20 66 |ectories| using f|
|00001ec0| 69 6c 65 73 20 69 6e 20 | 61 20 74 68 69 72 64 20 |iles in |a third |
|00001ed0| 64 69 72 20 61 73 20 61 | 6e 63 65 73 74 6f 72 73 |dir as a|ncestors|
|00001ee0| 2e 22 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 64 |." ediff|-merge-d|
|00001ef0| 69 72 65 63 74 6f 72 69 | 65 73 2d 77 69 74 68 2d |irectori|es-with-|
|00001f00| 61 6e 63 65 73 74 6f 72 | 20 65 64 69 72 2d 6d 65 |ancestor| edir-me|
|00001f10| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 20 22 4d |rge-revi|sions "M|
|00001f20| 65 72 67 65 20 76 65 72 | 73 69 6f 6e 73 20 6f 66 |erge ver|sions of|
|00001f30| 20 66 69 6c 65 73 20 69 | 6e 20 61 20 64 69 72 65 | files i|n a dire|
|00001f40| 63 74 6f 72 79 2e 22 20 | 65 64 69 66 66 2d 6d 65 |ctory." |ediff-me|
|00001f50| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |rge-dire|ctory-re|
|00001f60| 76 69 73 69 6f 6e 73 20 | 65 64 69 66 66 2d 6d 65 |visions |ediff-me|
|00001f70| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |rge-dire|ctory-re|
|00001f80| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00001f90| 65 73 74 6f 72 20 22 4d | 65 72 67 65 20 76 65 72 |estor "M|erge ver|
|00001fa0| 73 69 6f 6e 73 20 6f 66 | 20 66 69 6c 65 73 20 69 |sions of| files i|
|00001fb0| 6e 20 61 20 64 69 72 65 | 63 74 6f 72 79 20 75 73 |n a dire|ctory us|
|00001fc0| 69 6e 67 20 6f 74 68 65 | 72 20 76 65 72 73 69 6f |ing othe|r versio|
|00001fd0| 6e 73 20 61 73 20 61 6e | 63 65 73 74 6f 72 73 2e |ns as an|cestors.|
|00001fe0| 22 20 65 64 69 72 2d 6d | 65 72 67 65 2d 72 65 76 |" edir-m|erge-rev|
|00001ff0| 69 73 69 6f 6e 73 2d 77 | 69 74 68 2d 61 6e 63 65 |isions-w|ith-ance|
|00002000| 73 74 6f 72 20 65 64 69 | 66 66 2d 73 68 6f 77 2d |stor edi|ff-show-|
|00002010| 72 65 67 69 73 74 72 79 | 20 22 65 64 69 66 66 2d |registry| "ediff-|
|00002020| 6d 75 6c 74 22 20 22 44 | 69 73 70 6c 61 79 20 74 |mult" "D|isplay t|
|00002030| 68 65 20 72 65 67 69 73 | 74 72 79 20 6f 66 20 61 |he regis|try of a|
|00002040| 63 74 69 76 65 20 45 64 | 69 66 66 20 73 65 73 73 |ctive Ed|iff sess|
|00002050| 69 6f 6e 73 2e 22 20 65 | 72 65 67 69 73 74 72 79 |ions." e|registry|
|00002060| 20 65 64 69 66 66 2d 64 | 6f 63 75 6d 65 6e 74 61 | ediff-d|ocumenta|
|00002070| 74 69 6f 6e 20 22 44 69 | 73 70 6c 61 79 20 45 64 |tion "Di|splay Ed|
|00002080| 69 66 66 27 73 20 6d 61 | 6e 75 61 6c 2e 22 20 65 |iff's ma|nual." e|
|00002090| 64 69 66 66 2d 76 65 72 | 73 69 6f 6e 20 22 53 68 |diff-ver|sion "Sh|
|000020a0| 6f 77 20 45 64 69 66 66 | 27 73 20 76 65 72 73 69 |ow Ediff|'s versi|
|000020b0| 6f 6e 20 61 6e 64 20 6c | 61 73 74 20 6d 6f 64 69 |on and l|ast modi|
|000020c0| 66 69 63 61 74 69 6f 6e | 20 64 61 74 65 2e 22 20 |fication| date." |
|000020d0| 65 64 69 66 66 2d 74 6f | 67 67 6c 65 2d 6d 75 6c |ediff-to|ggle-mul|
|000020e0| 74 69 66 72 61 6d 65 20 | 22 65 64 69 66 66 2d 75 |tiframe |"ediff-u|
|000020f0| 74 69 6c 22 20 22 54 6f | 67 67 6c 65 20 74 68 65 |til" "To|ggle the|
|00002100| 20 75 73 65 20 6f 66 20 | 73 65 70 61 72 61 74 65 | use of |separate|
|00002110| 20 66 72 61 6d 65 20 66 | 6f 72 20 45 64 69 66 66 | frame f|or Ediff|
|00002120| 20 63 6f 6e 74 72 6f 6c | 20 62 75 66 66 65 72 2e | control| buffer.|
|00002130| 22 20 65 64 69 66 66 2d | 74 6f 67 67 6c 65 2d 75 |" ediff-|toggle-u|
|00002140| 73 65 2d 74 6f 6f 6c 62 | 61 72 20 22 54 6f 67 67 |se-toolb|ar "Togg|
|00002150| 6c 65 20 74 68 65 20 75 | 73 65 20 6f 66 20 45 64 |le the u|se of Ed|
|00002160| 69 66 66 20 74 6f 6f 6c | 62 61 72 2e 22 20 70 72 |iff tool|bar." pr|
|00002170| 6f 76 69 64 65 20 65 64 | 69 66 66 2d 68 6f 6f 6b |ovide ed|iff-hook|
|00002180| 5d 20 35 29 0a          |                         |] 5).   |        |
+--------+-------------------------+-------------------------+--------+--------+